From 71afd762ed259abe05618674007b05d49993a68c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 31 Oct 2015 20:24:19 -0400
Subject: [PATCH] Adwaita: Update progressbar styling

Adapt to the changes in the previous commit.
---
 gtk/theme/Adwaita/_common.scss           | 56 ++++++++++----------
 gtk/theme/Adwaita/gtk-contained-dark.css | 67 ++++++++++++------------
 gtk/theme/Adwaita/gtk-contained.css      | 67 ++++++++++++------------
 3 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 2b72f7dd14..2b0845570c 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2356,40 +2356,34 @@ checkbutton.text-button, radiobutton.text-button {
  * Progress bars *
  *****************/
 
-GtkProgressBar {
+progressbar {
   padding: 0;
   font-size: smaller;
   color: transparentize($fg_color, 0.6);
   box-shadow: inset 1px 1px transparentize(black, 0.9), // needs to be set
               _widget_edge();                           // here ot it gets
                                                         // clipped
+  border: 1px solid $borders_color;
+  border-radius: 3px;
+  background-color: mix($borders_color, $bg_color, 35%);
+
   &:backdrop {
     color: $backdrop_insensitive_color;
+    border-color: $backdrop_borders_color;
+    background-color: $backdrop_dark_fill;
+    box-shadow: 0 1px transparentize(white,1);
   }
   &.osd {
     -GtkProgressBar-xspacing: 0;
     -GtkProgressBar-yspacing: 0;
     -GtkProgressBar-min-horizontal-bar-height: 3;
-  }
-  &.trough {  // background
-    border: 1px solid $borders_color;
-    border-radius: 3px;
-    background-color: mix($borders_color, $bg_color, 35%);
-    &:backdrop{
-      border-color: $backdrop_borders_color;
-      background-color: $backdrop_dark_fill;
-      box-shadow: 0 1px transparentize(white,1);
-    }
-    &.osd {
-      border-style: none;
-      background-color: transparent;
-      box-shadow: none;
-    }
+    border-style: none;
+    background-color: transparent;
+    box-shadow: none;
   }
 }
 
-// moving bit
-.progressbar {
+progressbar.horizontal progress {
   @include progressbar_fill;
   border: 1px solid $selected_borders_color;
   border-radius: 1.5px;
@@ -2405,17 +2399,21 @@ GtkProgressBar {
   &.left.right {
     box-shadow: none;
   }
-  &.vertical {
-    @include progressbar_fill(vertical);
-    &.bottom {
-      border-bottom-left-radius: 3px;
-      border-bottom-right-radius: 3px;
-      box-shadow: none;
-    }
-    &.top {
-      border-top-left-radius: 3px;
-      border-top-right-radius: 3px;
-    }
+}
+
+progressbar.vertical progress {
+  @include progressbar_fill(vertical);
+  border: 1px solid $selected_borders_color;
+  border-radius: 1.5px;
+  box-shadow: none; //needed for clipping
+  &.bottom {
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px;
+    box-shadow: none;
+  }
+  &.top {
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
   }
   &:backdrop {
     border-color: if($variant=='light', $selected_bg_color,
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 07d67dd004..5409b9b4ed 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3410,58 +3410,59 @@ checkbutton.text-button, radiobutton.text-button {
 /*****************
  * Progress bars *
  *****************/
-GtkProgressBar {
+progressbar {
   padding: 0;
   font-size: smaller;
   color: rgba(238, 238, 236, 0.4);
-  box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-  GtkProgressBar:backdrop {
-    color: #5d6767; }
-  GtkProgressBar.osd {
+  box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+  border: 1px solid #1c1f1f;
+  border-radius: 3px;
+  background-color: #2f3434; }
+  progressbar:backdrop {
+    color: #5d6767;
+    border-color: #1f2222;
+    background-color: #303535;
+    box-shadow: 0 1px rgba(255, 255, 255, 0); }
+  progressbar.osd {
     -GtkProgressBar-xspacing: 0;
     -GtkProgressBar-yspacing: 0;
-    -GtkProgressBar-min-horizontal-bar-height: 3; }
-  GtkProgressBar.trough {
-    border: 1px solid #1c1f1f;
-    border-radius: 3px;
-    background-color: #2f3434; }
-    GtkProgressBar.trough:backdrop {
-      border-color: #1f2222;
-      background-color: #303535;
-      box-shadow: 0 1px rgba(255, 255, 255, 0); }
-    GtkProgressBar.trough.osd {
-      border-style: none;
-      background-color: transparent;
-      box-shadow: none; }
+    -GtkProgressBar-min-horizontal-bar-height: 3;
+    border-style: none;
+    background-color: transparent;
+    box-shadow: none; }
 
-.progressbar {
+progressbar.horizontal progress {
   background-image: linear-gradient(to bottom, #215d9c 2px, #266cb5);
   border: 1px solid #0f2b48;
   border-radius: 1.5px;
   box-shadow: none; }
-  .progressbar.left {
+  progressbar.horizontal progress.left {
     border-top-left-radius: 3px;
     border-bottom-left-radius: 3px; }
-  .progressbar.right {
+  progressbar.horizontal progress.right {
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px; }
-  .progressbar.left.right {
+  progressbar.horizontal progress.left.right {
     box-shadow: none; }
-  .progressbar.vertical {
-    background-image: linear-gradient(to right, #215d9c 2px, #266cb5); }
-    .progressbar.vertical.bottom {
-      border-bottom-left-radius: 3px;
-      border-bottom-right-radius: 3px;
-      box-shadow: none; }
-    .progressbar.vertical.top {
-      border-top-left-radius: 3px;
-      border-top-right-radius: 3px; }
-  .progressbar:backdrop {
+
+progressbar.vertical progress {
+  background-image: linear-gradient(to right, #215d9c 2px, #266cb5);
+  border: 1px solid #0f2b48;
+  border-radius: 1.5px;
+  box-shadow: none; }
+  progressbar.vertical progress.bottom {
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px;
+    box-shadow: none; }
+  progressbar.vertical progress.top {
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px; }
+  progressbar.vertical progress:backdrop {
     border-color: #0f2b48;
     background-image: none;
     background-color: #215d9c;
     box-shadow: none; }
-  .progressbar.osd {
+  progressbar.vertical progress.osd {
     background-image: none;
     background-color: #215d9c;
     border-style: none;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index b177506193..1a34d7922b 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3572,58 +3572,59 @@ checkbutton.text-button, radiobutton.text-button {
 /*****************
  * Progress bars *
  *****************/
-GtkProgressBar {
+progressbar {
   padding: 0;
   font-size: smaller;
   color: rgba(46, 52, 54, 0.4);
-  box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
-  GtkProgressBar:backdrop {
-    color: #c7c7c7; }
-  GtkProgressBar.osd {
+  box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white;
+  border: 1px solid #a1a1a1;
+  border-radius: 3px;
+  background-color: #d2d2d2; }
+  progressbar:backdrop {
+    color: #c7c7c7;
+    border-color: darkgray;
+    background-color: #d5d5d5;
+    box-shadow: 0 1px rgba(255, 255, 255, 0); }
+  progressbar.osd {
     -GtkProgressBar-xspacing: 0;
     -GtkProgressBar-yspacing: 0;
-    -GtkProgressBar-min-horizontal-bar-height: 3; }
-  GtkProgressBar.trough {
-    border: 1px solid #a1a1a1;
-    border-radius: 3px;
-    background-color: #d2d2d2; }
-    GtkProgressBar.trough:backdrop {
-      border-color: darkgray;
-      background-color: #d5d5d5;
-      box-shadow: 0 1px rgba(255, 255, 255, 0); }
-    GtkProgressBar.trough.osd {
-      border-style: none;
-      background-color: transparent;
-      box-shadow: none; }
+    -GtkProgressBar-min-horizontal-bar-height: 3;
+    border-style: none;
+    background-color: transparent;
+    box-shadow: none; }
 
-.progressbar {
+progressbar.horizontal progress {
   background-image: linear-gradient(to bottom, #4a90d9 2px, #63a0de);
   border: 1px solid #184472;
   border-radius: 1.5px;
   box-shadow: none; }
-  .progressbar.left {
+  progressbar.horizontal progress.left {
     border-top-left-radius: 3px;
     border-bottom-left-radius: 3px; }
-  .progressbar.right {
+  progressbar.horizontal progress.right {
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px; }
-  .progressbar.left.right {
+  progressbar.horizontal progress.left.right {
     box-shadow: none; }
-  .progressbar.vertical {
-    background-image: linear-gradient(to right, #4a90d9 2px, #63a0de); }
-    .progressbar.vertical.bottom {
-      border-bottom-left-radius: 3px;
-      border-bottom-right-radius: 3px;
-      box-shadow: none; }
-    .progressbar.vertical.top {
-      border-top-left-radius: 3px;
-      border-top-right-radius: 3px; }
-  .progressbar:backdrop {
+
+progressbar.vertical progress {
+  background-image: linear-gradient(to right, #4a90d9 2px, #63a0de);
+  border: 1px solid #184472;
+  border-radius: 1.5px;
+  box-shadow: none; }
+  progressbar.vertical progress.bottom {
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px;
+    box-shadow: none; }
+  progressbar.vertical progress.top {
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px; }
+  progressbar.vertical progress:backdrop {
     border-color: #4a90d9;
     background-image: none;
     background-color: #4a90d9;
     box-shadow: none; }
-  .progressbar.osd {
+  progressbar.vertical progress.osd {
     background-image: none;
     background-color: #4a90d9;
     border-style: none;
-- 
2.30.2